From 90cd444ac5078e1ea9ef4741eb57e07d775ff9a8 Mon Sep 17 00:00:00 2001 From: "awilliam@xenbuild.aw" Date: Tue, 28 Feb 2006 10:21:54 -0700 Subject: [PATCH] [IA64] cleanup warning in xen/ia64 (include/asm-ia64) These patches fix many issue (ex. panic dom0, oops domU/dom0...). we will fix compile warnnings one step at a time. Signed-off-by: Tsunehisa Doi Signed-off-by: Kouya SHIMURA Signed-off-by: Masaki Kanno Signed-off-by: Akio Takebe --- xen/include/asm-ia64/config.h | 2 +- xen/include/asm-ia64/mm.h | 1 + xen/include/asm-ia64/vcpu.h | 13 +++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h index 3ca2f12fe9..2dc69b84ea 100644 --- a/xen/include/asm-ia64/config.h +++ b/xen/include/asm-ia64/config.h @@ -255,7 +255,7 @@ struct screen_info { }; #define CONFIG_BLK_DEV_INITRD // needed to reserve memory for domain0 void dummy_called(char *function); -#define dummy() dummy_called(__FUNCTION__) +#define dummy() dummy_called((char *) __FUNCTION__) // these declarations got moved at some point, find a better place for them extern int ht_per_core; diff --git a/xen/include/asm-ia64/mm.h b/xen/include/asm-ia64/mm.h index cb09abe00f..1698fae6d3 100644 --- a/xen/include/asm-ia64/mm.h +++ b/xen/include/asm-ia64/mm.h @@ -407,6 +407,7 @@ extern unsigned long totalram_pages; extern int nr_swap_pages; extern unsigned long *mpt_table; +extern unsigned long gmfn_to_mfn_foreign(struct domain *d, unsigned long gpfn); extern unsigned long lookup_domain_mpa(struct domain *d, unsigned long mpaddr); #undef machine_to_phys_mapping #define machine_to_phys_mapping mpt_table diff --git a/xen/include/asm-ia64/vcpu.h b/xen/include/asm-ia64/vcpu.h index 492a759ea5..98416b076d 100644 --- a/xen/include/asm-ia64/vcpu.h +++ b/xen/include/asm-ia64/vcpu.h @@ -38,7 +38,9 @@ extern UINT64 vcpu_get_gr(VCPU *vcpu, unsigned long reg); extern IA64FAULT vcpu_get_gr_nat(VCPU *vcpu, unsigned long reg, UINT64 *val); extern IA64FAULT vcpu_set_gr(VCPU *vcpu, unsigned long reg, UINT64 value, int nat); /* application registers */ +extern void vcpu_load_kernel_regs(VCPU *vcpu); extern IA64FAULT vcpu_set_ar(VCPU *vcpu, UINT64 reg, UINT64 val); +extern IA64FAULT vcpu_get_ar(VCPU *vcpu, UINT64 reg, UINT64 *val); /* psr */ extern BOOLEAN vcpu_get_psr_ic(VCPU *vcpu); extern UINT64 vcpu_get_ipsr_int_state(VCPU *vcpu,UINT64 prevpsr); @@ -46,6 +48,9 @@ extern IA64FAULT vcpu_get_psr(VCPU *vcpu, UINT64 *pval); extern IA64FAULT vcpu_reset_psr_sm(VCPU *vcpu, UINT64 imm); extern IA64FAULT vcpu_set_psr_sm(VCPU *vcpu, UINT64 imm); extern IA64FAULT vcpu_set_psr_l(VCPU *vcpu, UINT64 val); +extern IA64FAULT vcpu_set_psr_i(VCPU *vcpu); +extern IA64FAULT vcpu_reset_psr_dt(VCPU *vcpu); +extern IA64FAULT vcpu_set_psr_dt(VCPU *vcpu); /* control registers */ extern IA64FAULT vcpu_set_dcr(VCPU *vcpu, UINT64 val); extern IA64FAULT vcpu_set_itm(VCPU *vcpu, UINT64 val); @@ -89,6 +94,8 @@ extern IA64FAULT vcpu_get_irr3(VCPU *vcpu, UINT64 *pval); extern IA64FAULT vcpu_get_lrr0(VCPU *vcpu, UINT64 *pval); extern IA64FAULT vcpu_get_lrr1(VCPU *vcpu, UINT64 *pval); /* interrupt registers */ +extern void vcpu_pend_unspecified_interrupt(VCPU *vcpu); +extern UINT64 vcpu_check_pending_interrupts(VCPU *vcpu); extern IA64FAULT vcpu_get_itv(VCPU *vcpu,UINT64 *pval); extern IA64FAULT vcpu_get_pmv(VCPU *vcpu,UINT64 *pval); extern IA64FAULT vcpu_get_cmcv(VCPU *vcpu,UINT64 *pval); @@ -99,6 +106,7 @@ extern IA64FAULT vcpu_set_cmcv(VCPU *vcpu, UINT64 val); /* interval timer registers */ extern IA64FAULT vcpu_set_itm(VCPU *vcpu,UINT64 val); extern IA64FAULT vcpu_set_itc(VCPU *vcpu,UINT64 val); +extern UINT64 vcpu_timer_pending_early(VCPU *vcpu); /* debug breakpoint registers */ extern IA64FAULT vcpu_set_ibr(VCPU *vcpu,UINT64 reg,UINT64 val); extern IA64FAULT vcpu_set_dbr(VCPU *vcpu,UINT64 reg,UINT64 val); @@ -135,9 +143,14 @@ extern IA64FAULT vcpu_ptr_d(VCPU *vcpu,UINT64 vadr, UINT64 addr_range); extern IA64FAULT vcpu_ptr_i(VCPU *vcpu,UINT64 vadr, UINT64 addr_range); extern IA64FAULT vcpu_translate(VCPU *vcpu, UINT64 address, BOOLEAN is_data, UINT64 *pteval, UINT64 *itir, UINT64 *iha); extern IA64FAULT vcpu_tpa(VCPU *vcpu, UINT64 vadr, UINT64 *padr); +extern IA64FAULT vcpu_force_data_miss(VCPU *vcpu, UINT64 ifa); +extern IA64FAULT vcpu_fc(VCPU *vcpu, UINT64 vadr); /* misc */ extern IA64FAULT vcpu_rfi(VCPU *vcpu); extern IA64FAULT vcpu_thash(VCPU *vcpu, UINT64 vadr, UINT64 *pval); +extern IA64FAULT vcpu_cover(VCPU *vcpu); +extern IA64FAULT vcpu_ttag(VCPU *vcpu, UINT64 vadr, UINT64 *padr); +extern IA64FAULT vcpu_get_cpuid(VCPU *vcpu, UINT64 reg, UINT64 *pval); extern void vcpu_pend_interrupt(VCPU *vcpu, UINT64 vector); extern void vcpu_pend_timer(VCPU *vcpu); -- 2.30.2